Partial migration away from gratuitious use of get-test-info