Change wait for test_cards_view and re-enable test.
Merge pull request #325 from zacc/reenable_cv

Change wait for test_cards_view and re-enable test.