Fix a couple of test errors in master