Added more unit tests
Merge pull request #4 from polewskm/working

Added more unit tests