Addressed todos, could do more refactoring
Using null safe operator
Merge pull request #902 from rackerlabs/test-fixes

Addressed todos, could do more refactoring