Changed test cases to match modifications in the implementation.
Yes, it should have been the other way around…