Fix for Agent tests