Card tests modified, AllTheMarbles added