Fix up failing tests on less mainstream platforms