cleaning up tests and API