More tests and a risky cleanup