Mock Boundary Review

Review mocks to check they stop at the right boundary and match real behaviour.

• review
• testing