same scope for variables / fix tests