cleanup; adjust mocking