* Refactor tests.