Fixes tests && header building for multiple rows..