Adding integration tests based on Watir
Merge conflict resolution