Removed 'final' modifiers so that these can be programatically changed during tests.