Fix build.gradle and tests

2 jobs for 35-cleanup in 5 minutes and 51 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #16176
build

00:02:30

 
  Test
passed #16177
test

00:03:21