More Tests, and Cleanup