wip adapt tests