Added test capture mechanism