Prepare for production manifests.

Shuffled a few tests once again, added a few TODO tests, and two new options
in preparation for implementation of production manifest handling.