am c6bae007: Fix build. optional tests were broken.

* commit 'c6bae007e6e29b585fc1207f84b378a480006173':
  Fix build. optional tests were broken.