More complete testing