Fix tests & slight API changes

[jorenbroekema]

TODO:

• [x] Fix integration tests
• [x] Fix pipeline issues
• [x] Create changesets
• [x] Squash some commits

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.