MB-7478: Code hooked up, unit tests do not run yet
MB-7478: Hookup calls, tests do not run yet