Refactored and added test for collecting bikes from garage