added additional parameters for mocking experts
removed unused modules
added additional conditions for mocking