* Fixed flaky test
* Increased gradle version to current
* Fixed issues with gradle not running tests