Clean up cards view
Fix cards view test