use scopes correctly please/ fixed tests