More work on tester support.