wip; fixed one test