[BUG #8468] fix some glitches
[BUG #8468] add missing tests