Fixed up failing tests