cleanup and some test data