Multiple bug fixes related to testing at one client.
Merge branch 'master' of github.com:pgexperts/handyrep