Start of adding test builders to simplify integration tests. I only updated a few test files. We can complete upgrading over time.