Added tests and some minor cleanup
Merge pull request #2 from polewskm/working

Added tests and some minor cleanup