revamp test - 2 basic test rig draft