Added some more unit tests
- #241