Revert errors in git usage! Got local and remote branches out of sync. Amend files and check tests