Fixing two bad variable names and also adding an extra conditional to handle some problems with the functional tests.
Fixing two bad variable names and also adding an extra conditional to handle some problems with the functional tests.

weaverryan/sfThemePlugin,weaverryan/sfThemePlugin