Fixed tests.  Now they pass (as expected)