adding scopes and parameter testing