Multiplatform support improved
Simplifying call for individual tests.