Added  classes and unit tests with tasks