Combined and simplified contexts.
Expanded upon integration test.