[WIP][issue #369] tests in progress