Backported unit test fix from release-003
Merge branch 'fixed-unit-tests' into release-003
Merge branch 'dev'
Merge remote-tracking branch 'origin' into MWEB-853
Reverse order of the methods to ensure stuff