Made CBL Mac and Listener work with the "Testing" configuration.
Merge commit '7d25302'