[XAPID-1037] add more tests and increase coverage
10 files changed