revamp test - 3 basic test rig draft