Tests reorganized