Re-organized test file.