All operators added, test improved