Converting more tests to mocha

55 more rules to go... Should I create one ticket for conversions, so we can track them all?