removed chapter 5 and edited tests