further linting, cleanup of puppet module, trying to get everything mocked and at least slightly tested [ci skip]