Add tests
Clean up