light test refactoring and added one garage test