Fix test data, cleanup tests