Junit tests updated