Fix sourcespatches test a bit and various tweaks to pass more tests.