make tests work for 2.2.1