code refactoring of Garage tests