Fix failing tests, wrong quoting