cleaning up test rig, giving own package