Aded testing and cleaned it.