Fix last hardcoded directory names in test suite
Reindent now shorter expected error message