[WIP] better tests