Refactor Scope (using enum), change test