More unit tests; bug fix; refactored some of the summary code
More testing; working on bugs