converted Tests and Models to those used in this chapter
+ added Junit test