Cleaned up some single-quote/double-quote silliness.
Unapplied previous roles commit

You can find it applied to the add-roles-fixture branch ^^