WIP Fix tests