added test and test cleanup