Partially fix failing tests