KAA-176: Test fixes for control server