Re-organized test.