Added some extra overloaded methods.
Cleaned up the test classes for Review.