WIP
fix tests