Clean up a test and add empty data test too