Restructure tests and improve hiding