Rewrites all of the existing unit tests to be valid for Rivet 2.0