updates gitignore
updates tests
merges masters
Updates tests for validation