Added missing tests, fixed cleanup