fixed a couple bugs in Testing Mode. More needed.