Merge pull request #46 from 30x/XAPID-958

reformat code for unit tests, add new test cases, coverage increased…