Next rewrite of minimality_test_general