Fix failing tests, I *think* logic is proper, just the test was wrong