Test architecture for HTML
More tests passing