[wip] fixed tests