Add chapter 7 unit tests for services