restructured and written tests