Added more junit tests
Added more junit tests