fixed tests by changing mocked clases and moving classes to run them allone