More fixes done to the tests.
Merge remote-tracking branch 'GitHub/develop' into develop