[#7409] ticket:595 Add new options to test config and fix tests
2 files changed