[BUG #7274] Added unit test