Update tests to reflect new method names and include test data.

This should have been done previously, tags v2.2.1-v2.2.4 do not have functioning tests.