Fix a few more failing tests