Changes for getting rid of warning due to undef in tests