Fix tests.
Reorganize default agents