(#2812) - Revive the unit tests