Test folders merged, gradle script fixed