Many of the unit tests fixed, but not all.  Not comipiling in unit test land either... sigh