Added better test result reporting, removed use of patch