Adds flex manifest 2 catalog Handling and according tests.