[BUG #8185] fix coding style and minor improvements
[BUG #8185] add more tests