getting david's test changes