wip: sti test refactor