Refactored the tests
Minor doc change