Added more files to ignore
Fixed test data
Fixed tests, added todo option
More test data