WIP: Fixing more tests