Fixing tests
Update readme
Fix merge conflict