add filter + test, minor changes, inherit test scopes from  instead of just creating empty scope