Merge "Fix knownfailures for test 152/154"