Fix failing tests

Method and block signatures had changed, but the tests weren't updated.