minor test changes after 4th round of reviews