Fixed tests
Merge pull request #3725 from GrahamCampbell/4.1-fixes

[IMPORTANT] FIXES FAILING TESTS