WIP
Fix incomplete tests