This is in preparation for enabling the tests for FIR which will be easier to do when the tests are on the new infrastructure.