Cleaup tests for new schema