Simplified test setup, added tests, clean up after tests