Added more junit tests