Extra test and gradle tweak