Fix tests for #22