Fixing tests, as best I can without a lot of good corp data from my account