Fixed tests for order in scope.