[BUG #8428] Added unit test