Fix up the tests for the extended platforms.