Finished chapter 3 (added test server etc)