Adding new test; cleanup