Fixed some tests issues. Have started chapter 8