Made some changes for testing package.