remove dynamic scope and update tests