fixed test errors from pulling branches