TEST: modified tests to reflect new generic optimization functions