Rescope teardown method to static tear_down() in order to avoid scope warnings. Abstract some stuff
Merge pull request #389 from unikent/fix/stop-tests-complaining

Stop running tests giving warnings