More thorough tests