Fixing a bug with older manifests and adding a test