Adds Tests for Common package and part of Client
Fixed conflicts