fix for irregular spacing and tests