Fix build.gradle and tests

2 jobs for 35-cleanup in 5 minutes and 51 seconds (queued for 3 seconds)