renamed namespace, tests work.
refactor: renamed classes; added test for Envelope.