updated tests (wip)