More testing work, got mocking examples looking good