fix nested tests
fix list tests
fix sti tests