Updated test format