Added Documentation
Improved UnitTest and added 2 methods