Updated Tests/ for phase 3