fixing build and test gradle issues