Refactored tests
Updated code
Removed old doc