Added a None
Refactored & improved test coverage