Unit tests for MBO and fix for double counting for restricted calcs