Changes to tests.  One test is still failing: crashing bug.