Testing and Script Fix