Fix tests for #4