Fixed the logic on test cases.  All testing scenarios currently run.