Fixed test setup to resolve unit test failures.

All 635u tests pass.