fixing tests wip