Add more test data, delete bad data