Adding class to group the data.
Implementing test routines.
improving the tests.