Fixes test errors