refactor tests (still wip)