WIP
fix test