Removing ununused imports and variables, declaring some test set up methods static
Merge pull request #1 from futures/suggestionsForBen

Removing ununused imports and variables, declaring some test set up methods static