Improve detection of simple tests.