[WIP][issue #89] tests modified