Small refactor in tests.