Fix alias escaping and add test fixtures