Make tests green cross-platform-aware.
Merge branch 'develop'