Issue #2: Correcting use of performance configuration throughout. Fixing several tests.