[WIP] Fixing tests