Add test_helper. Clean up tests.