Fix multi block argument and add some unit tests

Fix multi block argument and add some unit tests #50