Readme and tests updated

Readme now reflects updated nomenclature
updating gitignore