Unittests - More isolation

Fixes travis (hopefully)