Snow Leopard: Some reorganization in test files