Replaced test-specific testing implementation with decorator