Merge pull request #198 from cljohnso/issue/147

Closes #147 - Add non-bulk Ehcache unit tests