Adding unit tests
Resolving merge conflict