Added new tests and concluded
Resolved merge