clean up, start from scratch
basic tests around switching modes. pending a puzzling failure