Cleanup, block row testing