-Refactored junit tests, to be more clear