Add schema and fix single step test