More cleanup, start of tests.