Enhance documentation
Add note about tests
Fix conflicts