bug#4257 - fixed test failures

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>