First commit in a series of commits to clean up the contract tests. Made
a deploy helper function to remove some ugly nested awaits. Also
generally starting to remove unnecessary Factory objects.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>