Minor bug fix and commenting.

Added some test cases to fill out coverage.
Modified test output to be more explicit.
Removed unnecessary type and fixed conditional in normalization.