Add extra test logic