Fix tests. #36