Merge "[Ravenwood] Make sure Mockito actually works" into main