Increase buildToolsVersion
Tests: Some simplification