more tests and a slight tweak