Split 649 in smaller tests