Added tests
Tests improvements
Added OCMock & Expecta
Some refactoring
Fixed bug with merging
Added OCMock test