tests fixed?