Tentatively fix some failing tests