DDF-156 Removed commented out code. Added and adjusted tests. Handled null input.