Cleaning up test configuration and fixing test_data creation