Added test mechanism