praiskup/mock-fixes

Project ID: 26793

Build Monitor