Fixes test suit