Fixed index according to google group advices
Changed test to be in requested by Ayende Rahien format