Fixing gradle test errors