cleaning up tests and growing functionality