upgrade to new gradle and test fixes