Upgaded testing file