(wip) adapting tests