Updating tests to be able to run : BMS-6 : reviewer Naymesh