Refactor paver_tests.