Fix tests for 7bf9dc1 commit