[BUG #8522] add tests