Reorganized testing hints