Restructured tests for DictionaryDAO
Fixed a bit tests for CardDAO