Modified testing setup