Unit test support added.