Cleaned up JavaDoc and worte a unit test to confirm delegating behaviors