clean up modTest and modSearch further