beefing up and reorganizing the test suite