Concerning #477: more unittests, also exposed #751 and #752