Cleaned up a few more tests, renamed one control strategy and allowed error-correcting regression to be delayed