some improvements on testcards