Modified testing schema