Modified System for platform specific tests