Fixes some failing tests