improved test mechanism