Tweaked the tests
Merge pull request #5896 from GrahamCampbell/4.2-tests

[4.2] Tweaked The Tests