Fix specs and use %Q() rather than escaping.