fix single access clause
fix tests