remove some unused imports and some useless TODOs, slightly more coverage, @Overrides, more info on failing test, fix some Eclipse warnings