close #1 Refactoring Mock name and adding None testing