modify tests to enable testing both platforms