[WIP] better generated tests