Added test support.