Addressing CR: changes in tests, .gitignore and formatting