Make inner classes static if possible

Fix: Make the inner class DefaultReturnEventExtensionReturner.LastRequestHandleInterceptor static since it doesn't need a reference to its parent object.
Small style fixes in test classes

Fix: Some small style issues in some test classes.