Fixing up the tests and manifest.