A few tests failing
Added more involved infection functionality