added substep annotations to all tests