Fixing tests, changing expectations of one.