Modified testing routine