am 66e509b1: Fix some failing tests

* commit '66e509b1d4a8f41a7e4d6e26dfa0dd9995e945a9':
  Fix some failing tests