Adding more tests for Platform
Fixing platform comparison. Fixes issue 7522
Changes done to fix issue 7134 to avoid race conditions.