CHANGED: before/after hooks moved to around each executor

The pre/post and before/after hooks were actually the same, originally thought the pre/post were around each executor.

The before/after hooks now execute around each executor, with the after always being called whether an exception raised or not.