More infection API + tests.