15 minute commit, fixing gradle & testing