More test coverage for manifest files.
Fixes for servo.