Fix for stupidly breaking unit tests.