Ken,
  Done, I added the $H() functions which drastically reduced the beforeEach initialization.