Helping Students Build Their Understanding in Physics 20 and 30- From the Program of Studies to Skills Assessment on the Physics Diploma Exam