Add tests, clean-up
Clean-up