* fix unit tests. all tests pass now.