Fixes for test case after changing @EvictHistory output columns