CLN: clean up the testing suite