Final attempt at fixing test failure on build machine. Works as expected in a cloned plan