tests fixed so far!