resolve test errors for #38 and other related