Added more tests and corrected infections checking.