Slight changes to unit tests from code review
- #2270