Fix a few tests broken by previous commit