Fix overstate unit tests