Added tests for CardDAO
Modified CardDAO implementation