Forgot to disable these tests
Merge branch 'master' into anticache-memory