KAA-237: Improve test coverage of server components