Fix some problems for the remaining tests