broken tests fixed; one more to go