Fixing tests
- This is why we can't have nice things
Merge branch 'release' into dev