Split out tests into demo project, tidied gradle