added sophana's testing work back to the master