Fixing test failure and package references.