Re-structuring the tests.
Re-structuring the tests.