Fix dashes definitions, remove extra newlines from test output