Fixing a couple of tests, I accidentally renamed them during a refactor