Fix tests by fixing commit spacing algorithm