Final code and Junit