more tests and test helpers