#1074 fix and add new tests