Merge "Fix condition in one of the tests"