Remove call to old test that where moved.
Explicitly import what we need.
remove variable that aren't used.
remove not used code that used not existing variable.
fix import.
Merge pull request #1476 from nouiz/cleanup

Cleanup