Improved mocking
Skip failed mocking