DF-291 fixed GetTestId and other functions