Better support for recurrent testing.