Re-structures tests.