implemented null pattern, removed unnecessary classes, add in subscriber metadatafactory tests