Fixing tests to account for max span of 12