Corrected failing tests and worked around a possible temporary issues with histories