Changes to test blocks