chore(refactor): Remove AddHooks, refactor execution, add contract tests.

[kinyoklion]

This is a "chore" because I plan on rebase merging this feature branch and this is not a release-note change.