Fix failing feature
Remove explicit returns
Use instance variables instead of caching @options in GitLocation