Improved test for upgrading after blocking
Increased speed of regression tests