Add origin test, update fabric