More complete tests