update pc_test_swap to match pc_test; clean up some