added comment about having a separate class for the static mock
changed back to e vs. e1 on exception re-thrown.