some changes in packages and tests