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