Use version 2.1 in tests