MB-146 #Test refactoring - Pass 1/3