Fix tests for previous commit