Further refactoring of 2dcircles_optimize test