Refactor of tests for clarity.