Patched simpletest module (custom patch uploaded to temporary place) [ADS-52]