Moved tests from categories to classes.
Added Jeff's tests for his forwardingTarget implementation.
Formatting.