Fixing the unit tests, by adding the new origin check, we broke two other...

Fixing the unit tests, by adding the new origin check, we broke two other tests.  Setting the origin to the expected value.

close #469