fixes on some of the unit tests.