feature merges into develop scopes and tests