Fixes for broken tests following 0eabe2a (bug 878368)
Merge pull request #880 from muffinresearch/fix-manifest-test-fails

Fixes for broken tests following 0eabe2a (bug 878368)