[WIP][issue #83] tests modified