Continuation of modifications as tutorial progresses

refactor class definitions in class_prework

attempt to use external testing file (class_prework_test), but did not
work. Still to do.