cleaned up test format