Fixes test problems