Updated some tests to get them to pass again.