Add unit test support