Simplifying patch

Hello I made some modifications to apply patch throughout the Test class.