close #37
update tests