Added tested support for enhanced unit testing.