re-align architecture.MD with project
fixup UI related test failures
Merge pull request #359 from stefanpenner/fixup-test-failures

Fixup test failures