fleshing out the tests for the Mocks
shifting the tests from the old to the new structure