Modified interceptor callback to allow them to return replacement values.
Added some additional unit tests for interceptors.