updates to support test-ir.cpp