redid all broken unit tests