Added tests
Fix conflicts in .gitignore