Tester cleanup, prepping for a schema.