additional tests, mocking framework changes