DDF-458: Updated to get imports dynamically.
Was causing a build error on jdk8.
DDF-465: Code clean up.
Removed commented out code lines and duplicate code in the tests.