dep version bumps, test cleanup