#158 improve tests