DATAES-55 - polish test cases