Fixing tests
- This is why we can't have nice things