JBTM-2279 Updated the tests in case they are ran in a different order to ensure they can override the CAF