gradle default task refactored, a couple of tests corrected