Adding test corrections by Jegler Martin.
Also eliminating unused imports