Tear down old logic
Redo tests