Fixes test issues