Make the test suite run under 2.1

This fixes #148. I've tried running the test suite under 1.9, 2.0 and 2.1 on my machine and they all pass. It would be great if someone could confirm this.