Refactor how we fall back to the default attribute filter when running tests