Minor changes to fix SpecTest, remove the TODO for the manifest