List tests done
Conditionials done, and base edit made less flakey