#589 fix package and tests