Merge pull request #21 from apple/revert-20-revert-19-revert-6a20dc2

Revert "Revert "Revert "Disable two tests because they fail in the CI."""