More tests added for agent (WIP)