many tweaks for working CSP mocks