Fixes failing tests