minor cleanup to (test_)figure