Added some tests
Added more unit tests. Now with 61% of coverage