fix platform detection in tests
Merge branch 'master' into cached