Working on unit tests
Fixing merge conflicts