Added unit tests
Added test class