Fix tests, test setup to reflect new code.