all tests pass with architecture changes.