Resolve exceptions messages + create test project
Resolve conflict