Increased test coverage based on Sonar.

These are all backwards. You put the actual value first then the expected value.