Reorganize test dependencies and their scopes