Make agent-init more consistent
Disable test code that are not compiling