tests fixed, 5 passes for now