Add back all the assert