Cleaning house.
Add some tests.