OK this is a cheat but still
Reduce the number of bogus failures on 1.8
Make Comment and Tuple reload-resilient