#92 #159 fixed with (3) samples and tests corrected