Tests now pass intermittently.