Adding more simple functionalities to the basic classes, starting Junit testing