fixed broken tests and added gitignore
merge