More readability change for tests