Drop gentest and correct