Refactored testing trademarks specs
Added support for agent