Refactor setup and teardown to include all pertinent hook scripts