units test verified fixes #11 fixes #25 close #18