Update test hack to match core code.