Fix overly specified tests that were broken by recent commit.