Removed unused methods
Improved code coverage