WIP: Fixing tests