WIP
Fix tests