24557 - unit tests are now set up correctly