fix testissues 5 and 7 with phones