Refactored attribute quoting
Updated tests