Adding test
Changed names of classes.
Adding tests.
Changed names of logic classes.