Changed test flow