Adding subscription feature controllers and tests