Refactored names for junit tests to pass