Refactor of tests.