Added test feature