Tests reorganized.