Make tests more python friendly
Before removing anything check that exists