Revert "Add mocks for new tests"

This reverts commit 217e71a8c4088841936bdb805176ea68dae79c5a.