wip
wip fix tests
wip
fix core tests