Fixed up failing tests problem