most recent changes, diff for jmock1