Improved unit testing support.