Minor fix and add to testsuite, Daniel
5 files changed