#1: using Specs2 Mockito matchers
#1: adding function-style method definitions instead of procedural ones
#1: using a TrieMap instead of ConcurrentHM
#1: tutorial: typo, commas
#1: tutorial: expanding the section on DI