Fix a few more test errors, Britain can take it from here