Tests for correct key removed
Tests for correct key removed

The tests didn't verify that the correct key is removed when
the keys are rotated.

Also, other cleanups

- Removed use of six where range is fine.
- Fixed order of arguments to assertEqual

Change-Id: I9accc27eb982943032acc8b4364c88c8bc8fe6b7

mahak/keystone,ajayaa/keystone,mahak/keystone,dstanek/keystone,himanshu-setia/keystone,cernops/keystone,klmitch/keystone,jamielennox/keystone,cernops/keystone,dims/keystone,roopali8/keystone,dstanek/keystone,openstack/keystone,jonnary/keystone,maestro-hybrid-cloud/keystone,openstack/keystone,vivekdhayaal/keystone,dstanek/keystone,jonnary/keystone,vivekdhayaal/keystone,idjaw/keystone,ilay09/keystone,ilay09/keystone,himanshu-setia/keystone,takeshineshiro/keystone,vivekdhayaal/keystone,openstack/keystone,mahak/keystone,jamielennox/keystone,idjaw/keystone,rajalokan/keystone,rajalokan/keystone,ajayaa/keystone,klmitch/keystone,dims/keystone,takeshineshiro/keystone,maestro-hybrid-cloud/keystone,ilay09/keystone,rajalokan/keystone,roopali8/keystone