add cluster tests; remove Ant tests