[WIP][issue #368] tests added