Updated patch, fixing a test that I mistakenly removed in the previous 
version.