Test coverage for mrcalc expanded to >90%