TST: Improve test coverage

Add coverage for some paths that are missed in base
Merge pull request #2 from bashtage/test-arch-model

TST: Improve test coverage