Changed use of mock