WIP
fix tests
remove test