clean substitution tests
use @test annotation with test naming