Add tests, clean up tests