Fix regressions in test cases

@ke-yu 

Some conditional definitions are not there in the Reivt2015 branch. This makes the compiler bypass some functions and as such some regression happens. I am adding the definitions to make the fix.