more tests
small tweaks and improvements