Fixed clean up context before rolling back to previous step. Modified puzzle testing rules.