[ACGENRAL] Add a test shim