Removed unused NullObject , completed test coverage