Fix broken tests
Fix other broken tests
Generate git.properties and build.properties