Added back in some PC tests, still need to refactor master acceptance test