Updated cluster_simple_test to add P1 and P2 switching