Made mocha tests follow simple naming pattern
Made mocha tests follow simple naming pattern

#5399

kamransaleem/waltz,khartec/waltz,khartec/waltz,khartec/waltz,davidwatkins73/waltz-dev,kamransaleem/waltz,davidwatkins73/waltz-dev,kamransaleem/waltz,khartec/waltz,davidwatkins73/waltz-dev,davidwatkins73/waltz-dev,kamransaleem/waltz