Added unit tests
Added more unit tests - base tests now present