Test suite update from Thomas Graf
2 files changed