improved test rig