fix tests... (wip)