Completed Classes. Added Test Class.

Completed Classes. Added Test Class.