related to #146 ...
but not yet working
Update tests for #148