Final code clean/sync
Starting on chapter 16, Python mocking