Added more junit tests for first