fix some of the broken unit tests; still have a hang to work out