RF-12975: fixed tests for EDT changes