Use provided gradle and fix tests