More cleanup and enumerated tests.