Allow most tests to pass with nocp

Currently the only tests to fail with this change are tests 40 and 60. I have not been able to figure out why they are different with nocp on.

test40 just off by one line now
test60 is completely broken with nocp