Fixed blocktests with extremely ugly code