Fixes test erorrs