minor cleanup in test_figures_from_entries