Refactored tests to use abstract base that represents the scope