Made some small changes to tests.