Fleshed out the testing a little more.
Changed DataPoint to store an integer version of the class instead of
string.