Modified test structuring