Refactor proxy specs to use macros