[Round 2] Making changes as per the new mocks