remove extraneous version
tons more test cleanups, better handling of post-test requisition cleanup