Fixed some inter-test effect bugs, still ugly