Much better organization of tests.