I merged the test code that u changed

Thank you