extend unit test coverage
Merge pull request #1 from 0xor1/dev

extend unit test coverage