Improve test coverage
Removed unused models
Updated readme