wip: tests getting closer