Fixed unit tests
Added unit test
Added unit tests