Fixes test suite in branch