Moved clusters into attributes, added Ec2LiveTest