Switching between subjects on the sat subject test

I have registered for the SAT subject tests for chemistry and biology, but now wish to take math II with chemistry... collegeboard is asking for an additional fee for these changes and is also putting me on the wait list status... should I then wait for the test day to make changes ON test day? Is there any chance that it might not be possible to make the switch form biology to math II on test day?