refactor fact import logic, todo more tests