CORE-4876: ongoing unit test dev