Added unittestingä
Resolving conflicts