gitignore fix
Added tests
merge