improved helper tests