Clean up the uploader, schema and test_helper