Add proxy spec macros
Refactor proxy specs to use macros