Adding test data and removing junk