Remove basic assumptions
Refactor setup & teardown