Added additional test format