Added subscription to composer files
Fix subscription unit tests and some cs