Added test support