DDF-807 - cleaned up some TODO's and imports
DDF-807 - corrected the assertThat argument ordering
DDF-807 - removed unneeded if, and bad comment