Add manifest test and fix bug blocking generic services