Test: Fix gradle issues