revamped some of the unit tests, started to fix another.