Refactor gradle namespace a bit; restore test case