Started working on unit tests
Added some more basic tests