Rename test file
Merge the two spec classes, jeez.

Also needed env protection for cli.py tests
Failing test of 'real' env var setup w/ prefix
Tighten up a debug line
Fix test fixture to match earlier test change
Can't put non strings directly into environ
Failing config level test re: env prefix
Implement env_prefix storage/transmission
Implement env prefixing at config level