More work on stress tests