Modified tests and created src folder
Resolved merge conflict for testing file