Merge "Add tests for static mocking" into main