Quickfix for the test suite