Added test support for extension