improve tests, add curve type