Cleaned up tests and added expert search and more/fewer detail test