Update tests to use a more flexible match to get around multi-system line endings