Misc minor cleanup of custom git logic
Add functional test for custom git controller