Clean everything up, and test the right thing