wip fix tests & stuff