Refactor to use scenario outline, test scopes more accurately