extended the test rig with variable dates etc