Reflect the latest changes in testing package