CCI block device unit tests

Also fixed a python2.5 regression with enumerate