more tests and cleaner helpers