Merged the test_update_plan test back into the split-up tests