20140411-0700-DWDT Added units tests. Still need to add DatabaseExtension tests