1. Fixing unit tests
2. Adding missing files to git