Solve test errors