Cleaned up agent_tests