Updated Card&Test for coverage