Write some more TDD - Adjust the code to make it more robust. Fix minor issues with null & false handling