Fix failing tests

[MaxStalker]

Description

Current main branch have failing tests - some of them due to updated or moved contracts and some because of limitations of Flow emulator or lerna setup.

This PR targets to fix those issues.

---

For contributor use:

• Targeted PR against master branch
• Linked to Github issue with discussion and accepted design OR link to spec that describes this work
• Code follows the standards mentioned here
• Updated relevant documentation
• Re-reviewed Files changed in the Github PR explorer
• Added appropriate labels

[changeset-bot]

⚠️ No Changeset found

Latest commit: 76c438e

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[MaxStalker]

@jribbink can you merge this one into master, so I can rebase and update #134 ? :)