GitHub #82 - Add tests, fix other tests
GitHub #82 - Nit fixes