O3 and add test back