Add to .gitignore
Merged
More tests and fixes