Shortened test lengths, and made the shifts slightly faster.