Fix test suite (maybe)