add unit test support