Fixed issues that arose in further testing.

Added testdata to show output.
Modified testing for more of a range of data.
(now if only I could rename commits without a lot of effort (and get
bool working perfectly))