cleaning up. adding a test.