Rebased tests to pass on Linux. Ignore one timed out test