Bugfixes for policy service provider configuration
tests toward 100% completion