CORE-4876: Unit test updates