revamp test - 4 basic test rig draft