Made test class platform-independent