some test simplifications