Fix load-order dependant failures in tests