WIP, working on cluster tests