optimize core test-case