Test fixes

A couple of small fixes where some expected results were incorrect.  - No review necessary.