Move common mock creation into methods to avoid duplication (which causes quality failures)