Fixed bug and set up cp1 tester